From: Roy Franz <roy.franz@linaro.org>
Date: Mon, 13 Oct 2014 19:56:29 +0000 (-0700)
Subject: Remove stray blexit()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4200
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=254ddde3799c73ebc35c995fe63396a8dd17f339;p=xen.git

Remove stray blexit()

A stray call to blexit() was in the normal processing path for handling
FDTs specified in the config file, causing the EFI boot code to
unconditionally exit.  Remove the blexit() call as it should never
have been here.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
Tested-by: Vijaya Kumar K<Vijaya.Kumar@caviumnetworks.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h
index 61cb13ad21..7abc059a75 100644
--- a/xen/arch/arm/efi/efi-boot.h
+++ b/xen/arch/arm/efi/efi-boot.h
@@ -359,7 +359,6 @@ static void __init efi_arch_cfg_file_early(EFI_FILE_HANDLE dir_handle, char *sec
     {
         split_string(name.s);
         read_file(dir_handle, s2w(&name), &dtbfile, NULL);
-            blexit(NULL);
         efi_bs->FreePool(name.w);
     }
     fdt = fdt_increase_size(&dtbfile, cfg.size + EFI_PAGE_SIZE);